Use anonymous mark instead of making up a bogus name for first_para_mark

2000-06-23  Havoc Pennington  <hp@redhat.com>

* gtk/gtktextview.c (gtk_text_view_set_buffer): Use anonymous mark
instead of making up a bogus name for first_para_mark

* gtk/gtkstatusbar.h, gtk/gtkstatusbar.c: Allow
0 as a context ID

diff --git a/ChangeLog b/ChangeLog
index 90808ec66064fb503f50f182e4fb2fbeda0d9e43..192b196dea0340e594552472ce462621d5b13128 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-06-23  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_set_buffer): Use anonymous mark 
+       instead of making up a bogus name for first_para_mark
+
+       * gtk/gtkstatusbar.h, gtk/gtkstatusbar.c: Allow 
+       0 as a context ID
+
 Thu Jun 22 17:43:51 BST 2000  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Change filename. Add Section 3.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 90808ec66064fb503f50f182e4fb2fbeda0d9e43..192b196dea0340e594552472ce462621d5b13128 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+2000-06-23  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_set_buffer): Use anonymous mark 
+       instead of making up a bogus name for first_para_mark
+
+       * gtk/gtkstatusbar.h, gtk/gtkstatusbar.c: Allow 
+       0 as a context ID
+
 Thu Jun 22 17:43:51 BST 2000  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Change filename. Add Section 3.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 90808ec66064fb503f50f182e4fb2fbeda0d9e43..192b196dea0340e594552472ce462621d5b13128 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2000-06-23  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_set_buffer): Use anonymous mark 
+       instead of making up a bogus name for first_para_mark
+
+       * gtk/gtkstatusbar.h, gtk/gtkstatusbar.c: Allow 
+       0 as a context ID
+
 Thu Jun 22 17:43:51 BST 2000  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Change filename. Add Section 3.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 90808ec66064fb503f50f182e4fb2fbeda0d9e43..192b196dea0340e594552472ce462621d5b13128 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2000-06-23  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_set_buffer): Use anonymous mark 
+       instead of making up a bogus name for first_para_mark
+
+       * gtk/gtkstatusbar.h, gtk/gtkstatusbar.c: Allow 
+       0 as a context ID
+
 Thu Jun 22 17:43:51 BST 2000  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Change filename. Add Section 3.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 90808ec66064fb503f50f182e4fb2fbeda0d9e43..192b196dea0340e594552472ce462621d5b13128 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2000-06-23  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_set_buffer): Use anonymous mark 
+       instead of making up a bogus name for first_para_mark
+
+       * gtk/gtkstatusbar.h, gtk/gtkstatusbar.c: Allow 
+       0 as a context ID
+
 Thu Jun 22 17:43:51 BST 2000  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Change filename. Add Section 3.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 90808ec66064fb503f50f182e4fb2fbeda0d9e43..192b196dea0340e594552472ce462621d5b13128 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2000-06-23  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_set_buffer): Use anonymous mark 
+       instead of making up a bogus name for first_para_mark
+
+       * gtk/gtkstatusbar.h, gtk/gtkstatusbar.c: Allow 
+       0 as a context ID
+
 Thu Jun 22 17:43:51 BST 2000  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Change filename. Add Section 3.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 90808ec66064fb503f50f182e4fb2fbeda0d9e43..192b196dea0340e594552472ce462621d5b13128 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2000-06-23  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_set_buffer): Use anonymous mark 
+       instead of making up a bogus name for first_para_mark
+
+       * gtk/gtkstatusbar.h, gtk/gtkstatusbar.c: Allow 
+       0 as a context ID
+
 Thu Jun 22 17:43:51 BST 2000  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Change filename. Add Section 3.

diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
index f0826a7d8b072f9052e44bb617fe16a12e9a27f1..9b11615afee567e8d7a50db763f93fa6a56fd96b 100644 (file)
--- a/gtk/gtkstatusbar.c
+++ b/gtk/gtkstatusbar.c
@@ -202,7 +202,6 @@ gtk_statusbar_push (GtkStatusbar *statusbar,
   g_return_val_if_fail (statusbar != NULL, 0);
   g_return_val_if_fail (GTK_IS_STATUSBAR (statusbar), 0);
   g_return_val_if_fail (text != NULL, 0);
-  g_return_val_if_fail (context_id > 0, 0);
 
   class = GTK_STATUSBAR_GET_CLASS (statusbar);
   msg = g_chunk_new (GtkStatusbarMsg, class->messages_mem_chunk);
@@ -228,7 +227,6 @@ gtk_statusbar_pop (GtkStatusbar *statusbar,
 
   g_return_if_fail (statusbar != NULL);
   g_return_if_fail (GTK_IS_STATUSBAR (statusbar));
-  g_return_if_fail (context_id > 0);
 
   if (statusbar->messages)
     {
@@ -271,7 +269,6 @@ gtk_statusbar_remove (GtkStatusbar *statusbar,
 
   g_return_if_fail (statusbar != NULL);
   g_return_if_fail (GTK_IS_STATUSBAR (statusbar));
-  g_return_if_fail (context_id > 0);
   g_return_if_fail (message_id > 0);
 
   msg = statusbar->messages ? statusbar->messages->data : NULL;

diff --git a/gtk/gtkstatusbar.h b/gtk/gtkstatusbar.h
index c388124f5622a131d66bf0b95b26ea85c04b70d8..b2ecdb8c1719dd4b1e058483c839b01d5d7beb85 100644 (file)
--- a/gtk/gtkstatusbar.h
+++ b/gtk/gtkstatusbar.h
@@ -84,6 +84,9 @@ struct _GtkStatusbarMsg
 
 GtkType    gtk_statusbar_get_type      (void);
 GtkWidget* gtk_statusbar_new           (void);
+/* If you don't want to use contexts, 0 is a predefined global
+ * context_id you can pass to push/pop/remove
+ */
 guint     gtk_statusbar_get_context_id (GtkStatusbar *statusbar,
                                         const gchar  *context_description);
 /* Returns message_id used for gtk_statusbar_remove */

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 27b71014f05a0eed0e7bfa29605156265885922b..3947ff92fd16b06e0c1e9ea3ee87ea01bc7b5532 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -667,13 +667,10 @@ gtk_text_view_set_buffer (GtkTextView *text_view,
                                                         "__drag_target",
                                                         &start, FALSE);
 
-      /* Initialize. FIXME: Allow anonymous marks and use one here
-       */
-      mark_name = g_strdup_printf ("__first_para_%p", text_view);
       text_view->first_para_mark = gtk_text_buffer_create_mark (text_view->buffer,
-                                                               mark_name,
+                                                                NULL,
                                                                &start, TRUE);
-      g_free (mark_name);
+      
       text_view->first_para_pixels = 0;
       
       gtk_signal_connect (GTK_OBJECT (text_view->buffer), "mark_set",